Auto merge of #1616 - sbeckeriv:master, r=alexcrichton

author bors <bors@rust-lang.org>

Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)

committer bors <bors@rust-lang.org>

Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
author bors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
committer bors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
diff --cc src/cargo/util/toml.rs
Simple merge
diff --cc tests/test_cargo_compile.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
committer	bors <bors@rust-lang.org>
	Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
		1	2
src/cargo/util/toml.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/test_cargo_compile.rs	patch \|	diff1 \|	diff2 \|	blob \| history